Relative URL link conversion fix

James Peret 8 years ago
parent
commit
1b131273d8
3 changed files with 5 additions and 3 deletions
  1. 1 0
      app/index.html
  2. 2 1
      app/scripts/controllers/note-view-ctrl.js
  3. 2 2
      app/views/index.html

+ 1 - 0
app/index.html

@@ -22,6 +22,7 @@
22 22
     <script src="../bower_components/angular-highlightjs/src/angular-highlightjs.js"></script>
23 23
     <script src="scripts/highlight.pack.js"></script>
24 24
 
25
+
25 26
     <script src="scripts/codex-app.js"></script>
26 27
     <script src="scripts/controllers/app-ctrl.js"></script>
27 28
     <script src="scripts/controllers/header-ctrl.js"></script>

+ 2 - 1
app/scripts/controllers/note-view-ctrl.js

@@ -65,6 +65,8 @@ angular.module('codexApp.noteView', [])
65 65
             }
66 66
             if(e.srcElement.protocol == "file:"){
67 67
               var url = e.srcElement.outerHTML.match(/href="([^"]*)/)[1];
68
+              //url = FileService.getNotesDir() + "/" + url;
69
+              url = $scope.fixRelativeURL($scope.note.path, url)
68 70
               var note = FileService.getNote(url);
69 71
               FileService.setCurrentNote(note);
70 72
               $scope.note = note;
@@ -110,7 +112,6 @@ angular.module('codexApp.noteView', [])
110 112
       }
111 113
       var page_images = document.getElementsByTagName('img');
112 114
       console.log("-> Changing "+ img_urls.length + " images")
113
-      console.log(page_images)
114 115
       for(var i = 0; i < img_urls.length; i++) {
115 116
           console.log(page_images[i]);
116 117
           page_images[i].src = img_urls[i];

+ 2 - 2
app/views/index.html

@@ -20,8 +20,8 @@
20 20
 </table>
21 21
 
22 22
 <div class="file-view">
23
-  <ul>
24
-    <li ng-repeat="file in files track by $index" ng-dblclick="openFile(file)" class="file-view-item isotope-item fade-in" isotope-item="{{file.path}}">
23
+  <ul id="grid">
24
+    <li ng-repeat="file in files track by $index" ng-dblclick="openFile(file)" class="file-view-item fade-in" isotope-item="{{file.path}}">
25 25
       <div class="thumbnail-icon" ng-show="file.type != 'Folder'" ng-right-click="fileContextMenu(file)">
26 26
         <img src="{{getImageURL(file.path)}}" ng-hide="isImage(file.type)">
27 27
         <img src="{{file.thumbnail}}" ng-show="isImage(file.type)">